📦 Добавил URL сайта в rollup

Добавил брейкпоинт для маленьких экранов
This commit is contained in:
2020-09-27 12:50:16 +03:00
parent 4ff98125d8
commit c1c375d25e
5 changed files with 28 additions and 19 deletions

View File

@@ -2,6 +2,10 @@
"name": "variancc", "name": "variancc",
"description": "Variancc", "description": "Variancc",
"version": "0.0.1", "version": "0.0.1",
"repository": {
"type": "git",
"url": "https://github.com/anatolykopyl/variants.git"
},
"scripts": { "scripts": {
"dev": "sapper dev", "dev": "sapper dev",
"build": "sapper build --legacy", "build": "sapper build --legacy",
@@ -19,8 +23,6 @@
"uuid": "^8.3.0" "uuid": "^8.3.0"
}, },
"devDependencies": { "devDependencies": {
"sapper": "^0.28.0",
"svelte": "^3.17.3",
"@babel/core": "^7.0.0", "@babel/core": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.0.0", "@babel/plugin-transform-runtime": "^7.0.0",
@@ -29,9 +31,11 @@
"@rollup/plugin-babel": "^5.0.0", "@rollup/plugin-babel": "^5.0.0",
"@rollup/plugin-commonjs": "^14.0.0", "@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-node-resolve": "^8.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": "^2.3.4",
"rollup-plugin-svelte": "^6.0.0", "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"
} }
} }

View File

@@ -6,6 +6,9 @@ import babel from '@rollup/plugin-babel';
import { terser } from 'rollup-plugin-terser'; import { terser } from 'rollup-plugin-terser';
import config from 'sapper/config/rollup.js'; import config from 'sapper/config/rollup.js';
import pkg from './package.json'; import pkg from './package.json';
import dotenv from 'dotenv';
dotenv.config();
const mode = process.env.NODE_ENV; const mode = process.env.NODE_ENV;
const dev = mode === 'development'; const dev = mode === 'development';
@@ -23,7 +26,8 @@ export default {
plugins: [ plugins: [
replace({ replace({
'process.browser': true, '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({ svelte({
dev, dev,

View File

@@ -4,14 +4,14 @@
let memberCount = 10; let memberCount = 10;
function createRoom() { 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; window.location.href = url;
} }
let id; let id;
function connect() { function connect() {
const url=`http://localhost:3000/room/?id=${id}`; const url=`${process.env.URL}/room/?id=${id}`;
window.location.href = url; window.location.href = url;
} }
@@ -114,12 +114,6 @@
justify-content: center; justify-content: center;
} }
h1 {
font-size: xx-large;
font-weight: 100;
text-transform: uppercase;
}
h2 { h2 {
margin: 0px; margin: 0px;
font-weight: 100; font-weight: 100;
@@ -205,8 +199,15 @@
@media only screen and (max-width: 1024px) { @media only screen and (max-width: 1024px) {
.startbtns > div { .startbtns > div {
width: 70vw; width: 80vw;
height: 70vw; height: 80vw;
}
}
@media only screen and (max-width: 480px) {
.startbtns > div {
width: 97vw;
height: 97vw;
} }
} }
</style> </style>

View File

@@ -11,7 +11,7 @@
let room; let room;
async function getRoom() { 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); const res = await fetch(url);
room = await res.json(); room = await res.json();
} }
@@ -50,7 +50,7 @@
if (nameInput[selected] !== "" && nameInput[selected] !== undefined) { if (nameInput[selected] !== "" && nameInput[selected] !== undefined) {
room.teams[selected][room.teams[selected].length] = nameInput[selected]; room.teams[selected][room.teams[selected].length] = nameInput[selected];
//room.teams[selected].push(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); fetch(url);
nameInput[selected] = ""; nameInput[selected] = "";
} }
@@ -73,7 +73,7 @@
function removeName() { function removeName() {
room.teams[highlightedTeam] = room.teams[highlightedTeam].filter(n => n !== highlightedName); 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); fetch(url);
} }
</script> </script>

View File

@@ -47,7 +47,7 @@ MongoClient.connect(process.env.DB_CONNECTION, { useUnifiedTopology: true })
"teams": teams "teams": teams
}); });
res.redirect(`${process.env.URL}:3000/room/?id=${id}`); res.redirect(`${process.env.URL}/room/?id=${id}`);
}); });
// id // id