From c1c375d25eb23e495190e5ba250355160670b655 Mon Sep 17 00:00:00 2001
From: Anatoly Kopyl <akopyl@radner.ru>
Date: Sun, 27 Sep 2020 12:50:16 +0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20URL=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0=20=D0=B2=20?=
 =?UTF-8?q?rollup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил брейкпоинт для маленьких экранов
---
 package.json            | 12 ++++++++----
 rollup.config.js        |  6 +++++-
 src/routes/index.svelte | 21 +++++++++++----------
 src/routes/room.svelte  |  6 +++---
 src/server.js           |  2 +-
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 6bfa7fe..dc61a1c 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,10 @@
   "name": "variancc",
   "description": "Variancc",
   "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/anatolykopyl/variants.git"
+  },
   "scripts": {
     "dev": "sapper dev",
     "build": "sapper build --legacy",
@@ -19,8 +23,6 @@
     "uuid": "^8.3.0"
   },
   "devDependencies": {
-    "sapper": "^0.28.0",
-    "svelte": "^3.17.3",
     "@babel/core": "^7.0.0",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.0.0",
@@ -29,9 +31,11 @@
     "@rollup/plugin-babel": "^5.0.0",
     "@rollup/plugin-commonjs": "^14.0.0",
     "@rollup/plugin-node-resolve": "^8.0.0",
-    "@rollup/plugin-replace": "^2.2.0",
+    "@rollup/plugin-replace": "^2.3.3",
     "rollup": "^2.3.4",
     "rollup-plugin-svelte": "^6.0.0",
-    "rollup-plugin-terser": "^7.0.0"
+    "rollup-plugin-terser": "^7.0.0",
+    "sapper": "^0.28.0",
+    "svelte": "^3.17.3"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
index 9aaa40c..86f869e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -6,6 +6,9 @@ import babel from '@rollup/plugin-babel';
 import { terser } from 'rollup-plugin-terser';
 import config from 'sapper/config/rollup.js';
 import pkg from './package.json';
+import dotenv from 'dotenv';
+
+dotenv.config();
 
 const mode = process.env.NODE_ENV;
 const dev = mode === 'development';
@@ -23,7 +26,8 @@ export default {
 		plugins: [
 			replace({
 				'process.browser': true,
-				'process.env.NODE_ENV': JSON.stringify(mode)
+                'process.env.NODE_ENV': JSON.stringify(mode),
+                'process.env.URL': JSON.stringify(process.env.URL)
 			}),
 			svelte({
 				dev,
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 156e1b5..4080a3e 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -4,14 +4,14 @@
     let memberCount = 10;
     
     function createRoom() {
-        const url=`http://localhost:3000/api/create/?g=${groupTask}&n=${name}&c=${memberCount}`;
+        const url=`${process.env.URL}/api/create/?g=${groupTask}&n=${name}&c=${memberCount}`;
         window.location.href = url;
     }
 
     let id;
 
     function connect() {
-        const url=`http://localhost:3000/room/?id=${id}`;
+        const url=`${process.env.URL}/room/?id=${id}`;
         window.location.href = url;
     }
 
@@ -114,12 +114,6 @@
         justify-content: center;
     }
 
-    h1 {
-        font-size: xx-large;
-        font-weight: 100;
-        text-transform: uppercase;
-    }
-
     h2 {
         margin: 0px;
         font-weight: 100;
@@ -205,8 +199,15 @@
 
     @media only screen and (max-width: 1024px) {
         .startbtns > div {
-            width: 70vw;
-            height: 70vw;
+            width: 80vw;
+            height: 80vw;
+        }
+    }
+
+    @media only screen and (max-width: 480px) {
+        .startbtns > div {
+            width: 97vw;
+            height: 97vw;
         }
     }
 </style>
diff --git a/src/routes/room.svelte b/src/routes/room.svelte
index f45d0ec..172abb5 100644
--- a/src/routes/room.svelte
+++ b/src/routes/room.svelte
@@ -11,7 +11,7 @@
 
     let room;
     async function getRoom() {
-        var url = `http://localhost:3000/api/join/?id=${parsed.id}`;
+        var url = `${process.env.URL}/api/join/?id=${parsed.id}`;
 		const res = await fetch(url);
         room = await res.json();
     }
@@ -50,7 +50,7 @@
         if (nameInput[selected] !== "" && nameInput[selected] !== undefined) {
             room.teams[selected][room.teams[selected].length] = nameInput[selected];
             //room.teams[selected].push(nameInput[selected]);
-            var url = `http://localhost:3000/api/select/?id=${parsed.id}&name=${nameInput[selected]}&team=${selected}`;
+            var url = `${process.env.URL}/api/select/?id=${parsed.id}&name=${nameInput[selected]}&team=${selected}`;
             fetch(url);
             nameInput[selected] = "";
         }
@@ -73,7 +73,7 @@
 
     function removeName() {
         room.teams[highlightedTeam] = room.teams[highlightedTeam].filter(n => n !== highlightedName);
-        var url = `http://localhost:3000/api/delete/?id=${parsed.id}&name=${highlightedName}&team=${highlightedTeam}`;
+        var url = `${process.env.URL}/api/delete/?id=${parsed.id}&name=${highlightedName}&team=${highlightedTeam}`;
         fetch(url);
     }
 </script>
diff --git a/src/server.js b/src/server.js
index 88ae551..d2b5a9a 100644
--- a/src/server.js
+++ b/src/server.js
@@ -47,7 +47,7 @@ MongoClient.connect(process.env.DB_CONNECTION, { useUnifiedTopology: true })
                 "teams": teams
             });
 
-            res.redirect(`${process.env.URL}:3000/room/?id=${id}`);
+            res.redirect(`${process.env.URL}/room/?id=${id}`);
         });
 
         // id