Skip to content

Commit

Permalink
Merge pull request #6 from iic2154-uc-cl/ciclo1
Browse files Browse the repository at this point in the history
Merge develop into main: final integration before release
  • Loading branch information
luzmagurzua authored Oct 10, 2024
2 parents 3f1b70b + 0a67242 commit 18d3bda
Show file tree
Hide file tree
Showing 141 changed files with 9,404 additions and 0 deletions.
15 changes: 15 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# #AGREGAR API KEY DE GOOGLE MAPS:
# NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=
# NEXTAUTH_URL=http://localhost:3000
# NEXT_PUBLIC_SIGNIN_REDIRECT_URL=/user/profile
# NEXT_PUBLIC_DOMAIN=http://localhost:3000
# #CAMBIAR A DOMINIO DE PRODUCCION:
# NEXT_PUBLIC_API_URL=http://localhost:8000

# # Auth0 env variables
# #COMPLETAR:
# NEXT_PUBLIC_AUTH0_CLIENT_ID=15sdejCzUFK03CrkNMeJJTVYxsajbth0
# NEXT_PUBLIC_AUTH0_DOMAIN=dev-pposjm7jmfxhpepv.us.auth0.com
# NEXT_PUBLIC_LOGIN_REDIRECT_URL=http://localhost:3000/post/CreateProperty
# NEXT_PUBLIC_LOGOUT_REDIRECT_URL=http://localhost:3000

Binary file not shown.
Binary file not shown.
Binary file added .next/cache/webpack/client-development/0.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/1.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/10.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/11.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/2.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/3.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/4.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/5.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/6.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/7.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/8.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/client-development/9.pack.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .next/cache/webpack/server-development/0.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/1.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/2.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/3.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/4.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/5.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/6.pack.gz
Binary file not shown.
Binary file added .next/cache/webpack/server-development/7.pack.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions .next/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type": "commonjs"}
7 changes: 7 additions & 0 deletions geomapp/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
AUTH0_AUDIENCE='https://geomap/'
AUTH0_DOMAIN='dev-7w1no2zl1opt24if.us.auth0.com'
AUTH0_CLIENT_ID='QrElcRF9AI2H6dRBwCChbc04JvtKygJo'

#REACT_APP_AWS_ACCESS_KEY_ID=your_access_key
#REACT_APP_AWS_SECRET_ACCESS_KEY=your_secret_key
#REACT_APP_AWS_REGION=your_region
24 changes: 24 additions & 0 deletions geomapp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
8 changes: 8 additions & 0 deletions geomapp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
38 changes: 38 additions & 0 deletions geomapp/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import js from '@eslint/js'
import globals from 'globals'
import react from 'eslint-plugin-react'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'

export default [
{ ignores: ['dist'] },
{
files: ['**/*.{js,jsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
ecmaVersion: 'latest',
ecmaFeatures: { jsx: true },
sourceType: 'module',
},
},
settings: { react: { version: '18.3' } },
plugins: {
react,
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...js.configs.recommended.rules,
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
...reactHooks.configs.recommended.rules,
'react/jsx-no-target-blank': 'off',
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
]
Binary file added geomapp/imagen_logo.webp
Binary file not shown.
17 changes: 17 additions & 0 deletions geomapp/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Kaushan+Script&display=swap" rel="stylesheet">

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GeoMapp</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
42 changes: 42 additions & 0 deletions geomapp/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"name": "geomapp",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"lint": "eslint .",
"preview": "vite preview"
},
"dependencies": {
"@auth0/auth0-react": "^2.2.4",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@material-tailwind/react": "^2.1.10",
"@mui/lab": "^6.0.0-beta.10",
"@mui/material": "^6.1.2",
"@mui/system": "^6.1.2",
"@mui/x-date-pickers": "^7.19.0",
"@react-google-maps/api": "^2.19.3",
"aws-sdk": "^2.1691.0",
"axios": "^1.7.7",
"date-fns": "2.29.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.9",
"react-router-dom": "^6.26.2"
},
"devDependencies": {
"@eslint/js": "^9.11.1",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.2",
"eslint": "^9.11.1",
"eslint-plugin-react": "^7.37.0",
"eslint-plugin-react-hooks": "^5.1.0-rc.0",
"eslint-plugin-react-refresh": "^0.4.12",
"globals": "^15.9.0",
"vite": "^5.4.8"
}
}
1 change: 1 addition & 0 deletions geomapp/public/vite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions geomapp/src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/* #root {
max-width: 1280px;
margin: 0 auto;
padding: 2rem;
text-align: center;
} */
/*
.logo {
height: 6em;
padding: 1.5em;
will-change: filter;
transition: filter 300ms;
}
.logo:hover {
filter: drop-shadow(0 0 2em #646cffaa);
}
.logo.react:hover {
filter: drop-shadow(0 0 2em #61dafbaa);
}
@keyframes logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
@media (prefers-reduced-motion: no-preference) {
a:nth-of-type(2) .logo {
animation: logo-spin infinite 20s linear;
}
}
.card {
padding: 2em;
}
.read-the-docs {
color: #888;
} */
13 changes: 13 additions & 0 deletions geomapp/src/App.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import Router from './Router.jsx';
import './App.css';

function App() {
return (
<>
<Router />
</>
);
}

export default App;

33 changes: 33 additions & 0 deletions geomapp/src/Router.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import HelloWorld from './pages/helloworld.jsx';
import Auth0ProtectedPage from './pages/auth0.jsx';
import ExamplePage from './pages/examplePage.jsx';
import Servicios from './pages/servicios.jsx';
import Mapa from './pages/mapa.jsx';
import Publicaciones from './pages/users/publicaciones.jsx';
import Perfil from './pages/users/perfil.jsx';
import Publicar from './pages/users/publicar.jsx';

function Router() {

return (
<BrowserRouter>
<Routes>
<Route path="/" element={<HelloWorld />} />
<Route path="/auth0" element={<Auth0ProtectedPage />} />
<Route path="/example" element={<ExamplePage />} />
<Route path="/mapa-navegacion" element={<Mapa />}></Route>
<Route path="/servicios" element={<Servicios />}></Route>
<Route path="/inicio" element={<HelloWorld />} />
<Route path="/publicaciones" element={<Publicaciones />} />
<Route path="/mi-perfil" element={<Perfil />} />
<Route path="/publicar" element={<Publicar />} />



</Routes>
</BrowserRouter>
);
}

export default Router;
Binary file added geomapp/src/assets/a.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/buscar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/buscar2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/buscar3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/deportes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/eventos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/gastronomia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/hospedaje.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/imagen_inicio.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/logoo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/publicar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/servicios.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/servicios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/turismo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions geomapp/src/assets/vector.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added geomapp/src/assets/whatsapp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 75 additions & 0 deletions geomapp/src/components/AddressPopover.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import {
Popover,
PopoverHandler,
PopoverContent,
Typography,
List,
ListItem,
ListItemPrefix,
} from '@material-tailwind/react';
import { IconButton } from '@mui/material';

export default function AddressPopover(props) {
const { publication } = props;

const getPostAddressPlusDpto = () => {
if (publication.address && publication.dpto) {
return `${publication.address}, ${publication.dpto}`;
} else if (publication.address) {
return publication.address;
} else {
return '';
}
};


return (
<Popover placement="top">
<PopoverHandler>
<IconButton className="rounded-full" size="small">
<div className="flex flex-col items-center">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="black"
className="h-10 w-10 sm:h-7 sm:w-7 md:h-7 md:w-7 lg:h-7 lg:w-7 xl:h-8 xl:w-8"
>
<path
fillRule="evenodd"
d="M11.54 22.351l.07.04.028.016a.76.76 0 00.723 0l.028-.015.071-.041a16.975 16.975 0 001.144-.742 19.58 19.58 0 002.683-2.282c1.944-1.99 3.963-4.98 3.963-8.827a8.25 8.25 0 00-16.5 0c0 3.846 2.02 6.837 3.963 8.827a19.58 19.58 0 002.682 2.282 16.975 16.975 0 001.145.742zM12 13.5a3 3 0 100-6 3 3 0 000 6z"
clipRule="evenodd"
/>
</svg>
<Typography
color="blue-gray"
className="text-sm font-medium leading-tight sm:text-sm md:text-xs lg:text-sm"
>
Dirección
</Typography>
</div>
</IconButton>
</PopoverHandler>
<PopoverContent className="w-72">
<List className="p-0">
<ListItem>
<ListItemPrefix>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
className="h-5 w-5"
>
<path
fillRule="evenodd"
d="M11.54 22.351l.07.04.028.016a.76.76 0 00.723 0l.028-.015.071-.041a16.975 16.975 0 001.144-.742 19.58 19.58 0 002.683-2.282c1.944-1.99 3.963-4.98 3.963-8.827a8.25 8.25 0 00-16.5 0c0 3.846 2.02 6.837 3.963 8.827a19.58 19.58 0 002.682 2.282 16.975 16.975 0 001.145.742zM12 13.5a3 3 0 100-6 3 3 0 000 6z"
clipRule="evenodd"
/>
</svg>
</ListItemPrefix>
{getPostAddressPlusDpto()}
</ListItem>
</List>
</PopoverContent>
</Popover>
);
}
Loading

0 comments on commit 18d3bda

Please sign in to comment.