Skip to content

tab collection #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 110 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
5d1d8bf
strapi upgrade
Oct 5, 2023
5a78d08
strapi upgrade
Oct 5, 2023
1b9a67c
content types
Oct 6, 2023
b0f5b76
no rich text
Oct 6, 2023
09e4000
cloudinary
Oct 6, 2023
a9ade12
testing changes
Oct 7, 2023
4a4e0c5
testing changes
Oct 9, 2023
1545dc3
remove media
Oct 9, 2023
3cfa438
page
Oct 9, 2023
89127eb
homepage
Oct 9, 2023
4fad926
homepage + projectpage
Oct 9, 2023
d8f548c
fix images security
Oct 10, 2023
68563d4
docs
Oct 10, 2023
da65487
documentation
Oct 10, 2023
f055ae6
docs2
Oct 10, 2023
74f7caa
docs21
Oct 10, 2023
1111a09
package.json
Oct 10, 2023
6057a47
generating data
Oct 11, 2023
468c9d5
changing collections
Dec 7, 2023
beeb37e
projects collection
Dec 11, 2023
36de0e9
projects collection 2
Dec 12, 2023
0a9b35e
projects collection 3
Dec 12, 2023
df76de3
vercel deploy
Dec 13, 2023
b91af6b
markdown test
Dec 15, 2023
4b689a1
markdown test 2
Dec 15, 2023
7a8e79a
markdown test 4
Dec 15, 2023
1d558dc
fixing fildes
Dec 22, 2023
df9ca80
to boaz
Dec 28, 2023
e0d3ec3
any changes?
Dec 29, 2023
299cbba
project schema is done
Jan 2, 2024
e35bdae
request
boazglick Jan 3, 2024
cf5bb13
media restrict
Jan 3, 2024
3066f46
building schema
Jan 3, 2024
6ab1fe3
wapa
Jan 3, 2024
3dcbad5
wapaaa
Jan 3, 2024
614a55f
tab update collection
boazglick Jan 8, 2024
216a18f
deleted file
boazglick Jan 8, 2024
bf95eec
deleted tab collection
boazglick Jan 8, 2024
404ad23
back
boazglick Jan 9, 2024
72eaf84
new fileds
Jan 9, 2024
094639b
tabs made
Jan 9, 2024
f932147
commit
boazglick Jan 9, 2024
cc51cba
Merge branch 'master' of https://github.com/Carasso-Dev-Group/strapi-…
boazglick Jan 9, 2024
f45d7d1
assets
Jan 9, 2024
fe137bf
assets again
Jan 9, 2024
5adc4b0
Merge branch 'master' of https://github.com/Carasso-Dev-Group/strapi-…
boazglick Jan 21, 2024
0817ffd
access
boazglick Jan 23, 2024
9d4ef94
update relation of tabs to brand
boazglick Jan 23, 2024
cc7de0f
apartment collection and components
boazglick Jan 23, 2024
7a03cd9
updates of relations
boazglick Jan 23, 2024
103d28a
property collection
boazglick Jan 24, 2024
ae3c891
oregenizing apartments
boazglick Jan 25, 2024
774e392
relation appartment update
boazglick Jan 25, 2024
97e854f
New building collection
boazglick Jan 25, 2024
87022c6
cancel singel tab brand relation
boazglick Jan 25, 2024
2befc02
update brand
boazglick Jan 25, 2024
ff60ea0
apartments and buildings relations
boazglick Jan 25, 2024
81eb03b
update tab collection
boazglick Jan 25, 2024
524f8c2
deleted tab components
boazglick Jan 25, 2024
0134848
update relations
boazglick Jan 31, 2024
273d4f1
delet tab
boazglick Jan 31, 2024
bb5473e
update tab
boazglick Jan 31, 2024
74f2553
brand relation text field
boazglick Jan 31, 2024
4ec089a
update brand
boazglick Jan 31, 2024
eecb497
update relations
boazglick Feb 4, 2024
ac35f0a
update
boazglick Feb 5, 2024
6280a09
markdown
boazglick Feb 8, 2024
cf7cb68
brand fields
boazglick Feb 19, 2024
9d3b0dc
update tab type
boazglick Feb 19, 2024
e354655
realtion shop
boazglick Feb 19, 2024
58f8a48
update title & bold title to apartments
boazglick Feb 19, 2024
9fd4d0a
Apartment section for brands
boazglick Feb 19, 2024
7f8817a
update images and extra fileds
boazglick Feb 21, 2024
105bb27
post
boazglick Feb 28, 2024
1f91307
update
boazglick Feb 28, 2024
e318959
content aype drag n drop
Giladx Feb 28, 2024
6354db0
update building
boazglick Feb 28, 2024
8339410
update
boazglick Mar 4, 2024
beaf457
update
boazglick Mar 4, 2024
a72597c
update
boazglick Mar 4, 2024
9d819ab
master mash
Giladx Mar 4, 2024
86db348
update
boazglick Mar 6, 2024
bfd7652
update
boazglick Mar 6, 2024
86bf714
delet tag relation from brand
boazglick Mar 7, 2024
6ceaf39
brands has many tags :)
Giladx Mar 7, 2024
1c71e62
update
boazglick Mar 12, 2024
b327458
Merge branch 'master' of https://github.com/Carasso-Dev-Group/strapi-…
boazglick Mar 12, 2024
2842748
update tab
boazglick Mar 12, 2024
b516051
update
boazglick Mar 12, 2024
fc47879
delete plugin drag and drop
boazglick Mar 12, 2024
93d6bba
delet plugin
boazglick Mar 12, 2024
f57df58
update
boazglick Mar 12, 2024
3762526
delete all tab fileds
boazglick Mar 12, 2024
4ede639
tab check
boazglick Mar 12, 2024
93a9cc1
yarn lock
Giladx Mar 12, 2024
fae7ac9
rebuild tabs
boazglick Mar 12, 2024
1f00dbd
delete tabs
boazglick Mar 12, 2024
e16645c
update tabs
boazglick Mar 12, 2024
e4781db
update relation tab
boazglick Mar 12, 2024
ba0b17a
delete realtion field in tab
boazglick Mar 12, 2024
2564316
Update contentTypes.d.ts
boazglick Mar 12, 2024
5d93023
last try
boazglick Mar 12, 2024
b991a55
Thats it
boazglick Mar 12, 2024
ae7042d
no relation
boazglick Mar 12, 2024
feb0dbf
brand has many tags and tabs
boazglick Mar 12, 2024
69dc7a4
brands has many tabs
Giladx Mar 12, 2024
55745b9
brands has many tabs
Giladx Mar 12, 2024
e118fb5
fixing issue
Giladx Mar 12, 2024
aee3a25
fixing issue
Giladx Mar 12, 2024
21361cb
fixing issue
Giladx Mar 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .env.example

This file was deleted.

5 changes: 5 additions & 0 deletions .strapi-updater.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"latest": "4.20.4",
"lastUpdateCheck": 1710245994925,
"lastNotification": 1709752742720
}
22 changes: 22 additions & 0 deletions .strapi/client/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/**
* This file was automatically generated by Strapi.
* Any modifications made will be discarded.
*/
import documentation from "@strapi/plugin-documentation/strapi-admin";
import i18N from "@strapi/plugin-i18n/strapi-admin";
import usersPermissions from "@strapi/plugin-users-permissions/strapi-admin";
import generateData from "strapi-plugin-generate-data/strapi-admin";
import importExportEntries from "strapi-plugin-import-export-entries/strapi-admin";
import vercelDeploy from "strapi-plugin-vercel-deploy/strapi-admin";
import { renderAdmin } from "@strapi/strapi/admin";

renderAdmin(document.getElementById("strapi"), {
plugins: {
documentation: documentation,
i18n: i18N,
"users-permissions": usersPermissions,
"generate-data": generateData,
"import-export-entries": importExportEntries,
"vercel-deploy": vercelDeploy,
},
});
62 changes: 62 additions & 0 deletions .strapi/client/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE html>
<html lang="en">
<!--
This file was automatically generated by Strapi.
Any modifications made will be discarded.
-->
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, viewport-fit=cover"
/>
<meta name="robots" content="noindex" />
<meta name="referrer" content="same-origin" />
<title>Strapi Admin</title>
<style>
html,
body,
#strapi {
height: 100%;
}
body {
margin: 0;
-webkit-font-smoothing: antialiased;
}
</style>
</head>
<body>
<div id="strapi"></div>
<noscript
><div class="strapi--root">
<div class="strapi--no-js">
<style type="text/css">
.strapi--root {
position: absolute;
top: 0;
right: 0;
left: 0;
bottom: 0;
background: #fff;
}

.strapi--no-js {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
font-family: helvetica, arial, sans-serif;
}
</style>
<h1>JavaScript disabled</h1>
<p>
Please
<a href="https://www.enable-javascript.com/">enable JavaScript</a>
in your browser and reload the page to proceed.
</p>
</div>
</div></noscript
>
</body>
</html>
8 changes: 8 additions & 0 deletions config/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@ module.exports = ({ env }) => ({
auth: {
secret: env('ADMIN_JWT_SECRET'),
},
apiToken: {
salt: env('API_TOKEN_SALT'),
},
transfer: {
token: {
salt: env('TRANSFER_TOKEN_SALT'),
},
},
});
15 changes: 14 additions & 1 deletion config/middlewares.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
module.exports = [
"strapi::errors",
"strapi::security",
{
name: 'strapi::security',
config: {
contentSecurityPolicy: {
useDefaults: true,
directives: {
'connect-src': ["'self'", 'https:'],
'img-src': ["'self'", 'data:', 'blob:', 'res.cloudinary.com', 'market-assets.strapi.io', `loremflickr.com`],
'media-src': ["'self'", 'data:', 'blob:', 'res.cloudinary.com', 'market-assets.strapi.io', `loremflickr.com`],
upgradeInsecureRequests: null,
},
},
},
},
"strapi::cors",
"strapi::poweredBy",
"strapi::logger",
Expand Down
35 changes: 35 additions & 0 deletions config/plugins.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module.exports = ({ env }) => ({
'import-export-entries': {
enabled: true,
config: {
// See `Config` section.
},
},
upload: {
config: {
provider: 'cloudinary',
providerOptions: {
cloud_name: env('CLOUDINARY_NAME'),
api_key: env('CLOUDINARY_KEY'),
api_secret: env('CLOUDINARY_SECRET'),
},
actionOptions: {
upload: {},
delete: {},
},
},
},
'generate-data': {
enabled: true,
},
"vercel-deploy": {
enabled: true,
config: {
deployHook: process.env.VERCEL_DEPLOY_PLUGIN_HOOK,
apiToken: process.env.VERCEL_DEPLOY_PLUGIN_API_TOKEN,
appFilter: process.env.VERCEL_DEPLOY_PLUGIN_APP_FILTER,
teamFilter: process.env.VERCEL_DEPLOY_PLUGIN_TEAM_FILTER,
roles: ["strapi-super-admin"],
},
}
});
25 changes: 16 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,22 @@
"build": "strapi build",
"strapi": "strapi"
},
"devDependencies": {},
"dependencies": {
"@strapi/strapi": "4.1.7",
"@strapi/plugin-users-permissions": "4.1.7",
"@strapi/plugin-i18n": "4.1.7",
"@strapi/provider-upload-cloudinary": "4.1.7",
"pg": "^8.7.0",
"pg-connection-string": "^2.5.0",
"sqlite3": "latest"
"@strapi/plugin-documentation": "^4.15.5",
"@strapi/plugin-i18n": "4.15.5",
"@strapi/plugin-users-permissions": "4.15.5",
"@strapi/provider-upload-cloudinary": "^4.15.5",
"@strapi/strapi": "4.15.5",
"better-sqlite3": "^8.7.0",
"pg": "^8.11.3",
"pg-connection-string": "^2.6.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^5.2.0",
"strapi-plugin-generate-data": "^1.0.30",
"strapi-plugin-import-export-entries": "^1.21.1",
"strapi-plugin-vercel-deploy": "^1.4.0",
"styled-components": "^5.2.1"
},
"author": {
"name": "A Strapi developer"
Expand All @@ -26,7 +33,7 @@
"uuid": "5dbc738b-6a52-4a78-a46c-eed70aa61c15"
},
"engines": {
"node": ">=10.0.0",
"node": ">=16.0.0 <=20.x.x",
"npm": ">=6.0.0"
},
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion render.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
- type: web
name: strapi
name: strapi_carasso
env: node
plan: starter
buildCommand: yarn install && yarn build
Expand Down
15 changes: 15 additions & 0 deletions reset-password.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const strapi = require('strapi');

strapi(/* {...} */).start().then(() => {
const params = {
_where: { email: '[email protected]' }, // replace with your email
};
const user = {
password: 'newpassword', // replace with your new password
};

strapi.query('user', 'admin').update(params, user).then(() => {
console.log('Password updated successfully');
strapi.stop();
});
});
128 changes: 128 additions & 0 deletions src/api/apartment/content-types/apartment/schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"kind": "collectionType",
"collectionName": "apartments",
"info": {
"singularName": "apartment",
"pluralName": "apartments",
"displayName": "Apartment",
"description": ""
},
"options": {
"draftAndPublish": true
},
"pluginOptions": {},
"attributes": {
"Description_c": {
"type": "text"
},
"Number_of_Rooms__c": {
"type": "string"
},
"Apartment_image_galerry": {
"type": "media",
"multiple": false,
"required": false,
"allowedTypes": [
"images"
]
},
"Model_Code_Label__c": {
"type": "string"
},
"sketch_image": {
"type": "media",
"multiple": false,
"required": false,
"allowedTypes": [
"images"
]
},
"Apartment_type__c": {
"type": "string"
},
"Floor_numbers": {
"type": "string"
},
"Total_Balcony_Sqm__c": {
"type": "string"
},
"Apartment_sqm_c": {
"type": "string"
},
"brand": {
"type": "relation",
"relation": "oneToOne",
"target": "api::brand.brand"
},
"building": {
"type": "relation",
"relation": "manyToOne",
"target": "api::building.building",
"inversedBy": "apartments"
},
"Main_title": {
"type": "string"
},
"Main_bold_title": {
"type": "string"
},
"Extra_text_1": {
"type": "string"
},
"Extra_text_2": {
"type": "string"
},
"Extra_text_3": {
"type": "string"
},
"Extra_text_4": {
"type": "string"
},
"Extra_text_5": {
"type": "string"
},
"Extra_long_text_1": {
"type": "text"
},
"Extra_long_text_2": {
"type": "string"
},
"Extra_long_text_3": {
"type": "text"
},
"Extra_long_text_4": {
"type": "text"
},
"Extra_long_text_5": {
"type": "text"
},
"Extra_singel_media_1": {
"allowedTypes": [
"images"
],
"type": "media",
"multiple": false
},
"Extra_singel_media_2": {
"allowedTypes": [
"images"
],
"type": "media",
"multiple": false
},
"Extra_multipale_media_1": {
"allowedTypes": [
"images"
],
"type": "media",
"multiple": true
},
"Extra_multipale_media_2": {
"allowedTypes": [
"images"
],
"type": "media",
"multiple": true
}
}
}
9 changes: 9 additions & 0 deletions src/api/apartment/controllers/apartment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

/**
* apartment controller
*/

const { createCoreController } = require('@strapi/strapi').factories;

module.exports = createCoreController('api::apartment.apartment');
Loading