From 7a2c55cdcca6445ec980f7a531453453c5bb9f3a Mon Sep 17 00:00:00 2001 From: dim web Date: Sat, 6 Nov 2021 04:45:00 +0300 Subject: [PATCH] unlock cards change config --- .../v.2.0/select-and-learn/src/config/config.js | 2 +- .../select-and-learn/src/config/prod.env.js | 4 +++- .../main/v.2.0/select-and-learn/src/utils/api.js | 2 +- .../.firebase/hosting.ZGlzdA.cache | 8 ++++++++ frontend/frontend_learn_english/.firebaserc | 5 +++++ frontend/frontend_learn_english/firebase.json | 16 ++++++++++++++++ .../main/english_learn/select_learn/api/views.py | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 frontend/frontend_learn_english/.firebase/hosting.ZGlzdA.cache create mode 100644 frontend/frontend_learn_english/.firebaserc create mode 100644 frontend/frontend_learn_english/firebase.json diff --git a/extension/main/v.2.0/select-and-learn/src/config/config.js b/extension/main/v.2.0/select-and-learn/src/config/config.js index 8c9dec9..7704aac 100644 --- a/extension/main/v.2.0/select-and-learn/src/config/config.js +++ b/extension/main/v.2.0/select-and-learn/src/config/config.js @@ -1,7 +1,7 @@ import { prodConfig } from "./prod.env"; import { devConfig } from "./dev.env"; -const isProduction = false; +const isProduction = true; let config; diff --git a/extension/main/v.2.0/select-and-learn/src/config/prod.env.js b/extension/main/v.2.0/select-and-learn/src/config/prod.env.js index d4b2ddc..3cfec34 100644 --- a/extension/main/v.2.0/select-and-learn/src/config/prod.env.js +++ b/extension/main/v.2.0/select-and-learn/src/config/prod.env.js @@ -1,3 +1,5 @@ -const prodConfig = {}; +const prodConfig = { + url: "https://english-card-test.herokuapp.com/", +}; export { prodConfig }; diff --git a/extension/main/v.2.0/select-and-learn/src/utils/api.js b/extension/main/v.2.0/select-and-learn/src/utils/api.js index ffe4620..ee5413a 100644 --- a/extension/main/v.2.0/select-and-learn/src/utils/api.js +++ b/extension/main/v.2.0/select-and-learn/src/utils/api.js @@ -1,7 +1,7 @@ import axios from "axios"; import store from "../store/index"; // import router from "../router"; -import { config } from "vue/types/umd"; +import { config } from "../config/config"; var apiServer = axios.create({ baseURL: config.url, diff --git a/frontend/frontend_learn_english/.firebase/hosting.ZGlzdA.cache b/frontend/frontend_learn_english/.firebase/hosting.ZGlzdA.cache new file mode 100644 index 0000000..f8b314d --- /dev/null +++ b/frontend/frontend_learn_english/.firebase/hosting.ZGlzdA.cache @@ -0,0 +1,8 @@ +favicon.ico,1636160300282,d5451f0f0f0bcbcd433bbdf4f6e7e5d89d8ecce2650649e969ccb5e5cd499ab2 +index.html,1636160300280,a73dc9b0b6bc4783846c591cde5967dbb1c96fe1bb1237af313cb7964069161b +css/app.12da35a7.css,1636160300282,e4e7cd811838dcef6dda0f1b17d47ebcaa4d3e29ff0e5f202baaab8d74a6d40b +js/app.8c992de1.js,1636160300287,41c3d1feb24335577342846fe1cfae3fb05494e07c6500132679a4ec04b6d109 +js/app.8c992de1.js.map,1636160300287,b9a0824782f36f954811e63ef75363a02e5d86dc8efe4e43694c4c569eaddf4d +js/chunk-vendors.01353aba.js,1636160300287,00c1e39d124ced22f807c63864eae96f29b8796847307bd299128730fdc0e3ac +js/chunk-vendors.01353aba.js.map,1636160300287,044027f4509f45570095daf31c1870890fad6e337716aeb21d43acf0d19284d1 +google74708afb9bc5c4c2.html,1636161442495,0dbe53e182535cfa56fe20b0d0d8dbe2674c02670d48aeff8c9d4ebe6b27f3e7 diff --git a/frontend/frontend_learn_english/.firebaserc b/frontend/frontend_learn_english/.firebaserc new file mode 100644 index 0000000..3b05ccf --- /dev/null +++ b/frontend/frontend_learn_english/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "select-and-learn" + } +} diff --git a/frontend/frontend_learn_english/firebase.json b/frontend/frontend_learn_english/firebase.json new file mode 100644 index 0000000..2c33c29 --- /dev/null +++ b/frontend/frontend_learn_english/firebase.json @@ -0,0 +1,16 @@ +{ + "hosting": { + "public": "dist", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ], + "rewrites": [ + { + "source": "**", + "destination": "/index.html" + } + ] + } +} diff --git a/server/main/english_learn/select_learn/api/views.py b/server/main/english_learn/select_learn/api/views.py index c1f401b..bff5ad0 100644 --- a/server/main/english_learn/select_learn/api/views.py +++ b/server/main/english_learn/select_learn/api/views.py @@ -70,7 +70,7 @@ def get(self, request): sentence, word['word']) card['word_id'] = word['word_id'] cards.append(card) - cards = cards[:2] + # cards = cards[:2] return Response(cards, status=status.HTTP_200_OK) def put(self, request):