Skip to content

Commit

Permalink
unlock cards change config
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrymailk committed Nov 6, 2021
1 parent 6ccd2e9 commit 7a2c55c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 4 deletions.
2 changes: 1 addition & 1 deletion extension/main/v.2.0/select-and-learn/src/config/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { prodConfig } from "./prod.env";
import { devConfig } from "./dev.env";

const isProduction = false;
const isProduction = true;

let config;

Expand Down
4 changes: 3 additions & 1 deletion extension/main/v.2.0/select-and-learn/src/config/prod.env.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const prodConfig = {};
const prodConfig = {
url: "https://english-card-test.herokuapp.com/",
};

export { prodConfig };
2 changes: 1 addition & 1 deletion extension/main/v.2.0/select-and-learn/src/utils/api.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions frontend/frontend_learn_english/.firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "select-and-learn"
}
}
16 changes: 16 additions & 0 deletions frontend/frontend_learn_english/firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
2 changes: 1 addition & 1 deletion server/main/english_learn/select_learn/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 7a2c55c

Please sign in to comment.