#78 исправлены пути в конфиге

api/app/config.js

@@ -17,10 +17,12 @@ module.exports = {
     db: {
         // name: 'froot',
         // name: 'test',
-        //11 name:`${dbMongo}?authSource=${initDb}`,  //docker
-        url: 'mongodb://localhost',
+        // name:`${dbMongo}?authSource=${initDb}`,  //docker
+        name: process.env.MONGO_DB ? `${dbMongo}?authSource=${initDb}` : 'froot',
+        // url: 'mongodb://localhost',
         // url: 'mongodb+srv://QWE123:QWE123@cluster0.rrd3k.mongodb.net', // Pasha's mongo address !!
-        //11 url:`mongodb://${user}:${password}@${host}:${port}`,  //docker
+        // url:`mongodb://${user}:${password}@${host}:${port}`,  //docker
+        url:process.env.MONGO_USER ? `mongodb://${user}:${password}@${host}:${port}` : 'mongodb://localhost',
         // url: 'mongodb://104.248.198.29',
     },
     //11 baseUrlForTelegram: 'http://'+process.env.BOT_HOST,  //docker

api/app/helpers.js

@@ -65,17 +65,27 @@ module.exports = {
     },
 
     screenshot: async (url, name) => {
-        const browser = await puppeteer.launch();
-        const device_width = 1920;
-        const device_height = 1080;
-        const page = await browser.newPage();
-        await page.setViewport({ width: device_width, height: device_height })
-        await page.goto(url, { waitUntil: 'domcontentloaded' });
-        await page.screenshot({
-            fullPage: true,
-            path: `./public/uploads/${name}`
-        });
-        await browser.close();
+       try{
+            const browser = await puppeteer.launch(
+                {
+                    headless: true,
+                    args: ['--no-sandbox']
+                 }
+            );
+            const device_width = 1920;
+            const device_height = 1080;
+            const page = await browser.newPage();
+            await page.setViewport({ width: device_width, height: device_height })
+            await page.goto(url, { waitUntil: 'domcontentloaded' });
+            await page.screenshot({
+                fullPage: true,
+                path: `./public/uploads/${name}`
+            });
+            await browser.close();
+       }
+       catch(e){
+           console.log(e);
+       }
     },
 
     buildContentlinksReportExcelFile: async (contentlinks) => {
@@ -172,7 +182,7 @@ module.exports = {
             });
         };
 
-        const filename = 'ContentReport_' + moment().format('DD-MM-YYYY-HH-mm-ss') + '.xlsx';
+        const filename = 'ContentReport_' + moment().format('DD-MM-YYYY') + '.xlsx';
         await workbook.xlsx.writeFile('./public/files/' + filename);
 
         return usersObj;

api/app/models/News.js

@@ -16,6 +16,10 @@ const NewsSchema = new Schema({
     createDate: {
         type: String 
     },
+    contentManager: {
+        type: Schema.Types.ObjectId,
+        ref: 'User',
+    },
     status: {
         type: String,
         required: true,

api/app/models/User.js

@@ -73,7 +73,7 @@ const UserSchema = new Schema({
         type: [String],
         required: true,
         default: ['viewAllPayments'],
-        enum: ['viewAllPayments', 'addPayment', 'editPayment', 'approvePayment', 'payPayment', 'postponePayment', 'viewToBePaid', 'viewTodayPayments', 'initCancelApprovedPayment', 'cancelApprovedPayment', 'initCancelPayedPayment', 'cancelPayedPayment', 'deletePayment', 'stopRepeatabilityPayment', 'authorizeUser', 'editUser', 'deleteUser', 'viewUsers', 'bookMeetingRoom', 'editBookedMeetingRoom', 'deleteBookedMeetingRoom', 'viewBookingsMeetingRoom', 'addNewMeetingRoom', 'deleteMeetingRoom',  'addContentlink', 'viewOwnContentlinks', 'viewAllContentlinks', 'addNews', 'viewAllNews']
+        enum: ['viewAllPayments', 'addPayment', 'editPayment', 'approvePayment', 'payPayment', 'postponePayment', 'viewToBePaid', 'viewTodayPayments', 'initCancelApprovedPayment', 'cancelApprovedPayment', 'initCancelPayedPayment', 'cancelPayedPayment', 'deletePayment', 'stopRepeatabilityPayment', 'authorizeUser', 'editUser', 'deleteUser', 'viewUsers', 'bookMeetingRoom', 'editBookedMeetingRoom', 'deleteBookedMeetingRoom', 'viewBookingsMeetingRoom', 'addNewMeetingRoom', 'deleteMeetingRoom',  'addContentlink', 'viewOwnContentlinks', 'viewAllContentlinks', 'addNews', 'viewAllNews', 'changeStatusNews']
     },
     token: {
         type: [String],

api/app/news.js

@@ -29,7 +29,7 @@ const createRouter = () => {
     });
     router.get('/', auth, async (req, res) => {
         try {
-            const news = await News.find().populate("user");
+            const news = await News.find().populate(["user", "contentManager"]);
             res.send(news);
         } catch (e) {
             res.status(500).send(e);
@@ -38,7 +38,16 @@ const createRouter = () => {
     router.get('/:id/:status', auth, async (req, res) => {
         try {
             const newsItem = await News.findById(req.params.id)
-            newsItem.status = req.params.status
+            if(!newsItem.contentManager || (newsItem.contentManager && String(newsItem.contentManager._id) === String(req.user._id))) {
+                newsItem.status = req.params.status
+            }else {
+                return res.send({message: 'Вы не можете изменить статус данной новости'})
+            }
+            if(String(newsItem.status) === 'Не сделано') {
+                newsItem.contentManager = null
+            }else{
+                newsItem.contentManager = req.user._id
+            }
             await newsItem.save();
             res.send(newsItem);
         } catch (error) {

front/src/containers/AddRole/AddRole.js

@@ -114,7 +114,8 @@ const AddRole = () => {
     ]
     const rolesForNews = [
         {name: "addNews", text: "Добавить новость"},
-        {name: "viewAllNews", text: "Просмотреть все новсти"}
+        {name: "viewAllNews", text: "Просмотреть все новости"},
+        {name: "changeStatusNews", text: "Поменять статус новости"}
     ]
     const rolesForContentLinks = [
         {name: "addContentlink", text: "Создавать новые заявки"},

front/src/containers/ContentLinksReport/ContentLinksReport.js

@@ -47,7 +47,7 @@ const ContenLinksReport=()=>{
             }
         </div>
     )
-    const src=(apiURL+'/files/ContentReport_' + moment().format('DD-MM-YYYY-HH-mm-ss') + '.xlsx')
+    const src=(apiURL+'/files/ContentReport_' + moment().format('DD-MM-YYYY') + '.xlsx')
     return(
         <>
             <a href={src} download>Download Report</a>

front/src/containers/News/News.js

@@ -58,7 +58,6 @@ const News = () => {
     const closeModal = () => {
         setShowModal({ show: false })
     }
-    const today = moment().format('DD-MM-YYYY') 
     const modalBody = <>
         <h3>Добавьте карту ввода или вывода</h3>
         <form 
@@ -76,13 +75,15 @@ const News = () => {
             <ButtonPink text="Добавить" /> 
         </form>
         </>
+    const today = moment().format('DD-MM-YYYY') 
+    
     let statuses = ['Не сделано', 'В работе', 'Сделано']
     
     return (
         <>
             <div className="News flex-space">
                 <h2 >Сегодня: {today} </h2>
-                <ButtonPink text="Добавить" onClickHandler={openModal}/>   
+                {user && user.role.includes('addNews') && <ButtonPink text="Добавить" onClickHandler={openModal}/>}   
             </div>                     
             {showModal.show && <Modal className="News__modal" 
                                     body={modalBody} 
@@ -110,14 +111,14 @@ const News = () => {
                                 {newsItem.user && newsItem.user.surname + " " + newsItem.user.name}
                                 </td>
                             <td>
-                                {user && user.role.includes('viewAllNews') && user.surname + " " + user.name}
+                                {user && user.role.includes('viewAllNews') && newsItem.contentManager? newsItem.contentManager.surname + " " + newsItem.contentManager.name : null}
                                 </td>
-                            {user && user.role.includes('viewAllNews') && <td>
+                            <td>{user && user.role.includes('changeStatusNews')?  
                                 <Dropdown 
                                     dropdownTitle = {newsItem.status}
                                     dropdownContents = {statuses.filter(s => String(s) !== String(newsItem.status)) }
-                                    changeContentHandler = {(e, )=>changeStatusHandler(e, newsItem._id)}/></td>}
-                           
+                                    changeContentHandler = {(e, )=>changeStatusHandler(e, newsItem._id)}/> : newsItem.status}
+                            </td>                           
                         </tr>))}
                 </tbody>  
             </table>                                     

front/src/containers/RegistryForAccountant/RegistryForAccountant.js

@@ -134,7 +134,7 @@ const RegistryForAccountant = () => {
           <a
             className="RegistryForAccountant__downloads-btn"
             download
-            href={"http://localhost:8000/files/" + today + ".xlsx"}
+            href={apiURL+"/files/" + today + ".xlsx"}
           >
             Формирование Excell
           </a>