Some clean-up

author: Parker <contact@pkrm.dev> 2024-11-10 23:17:10 -0600
committer: Parker <contact@pkrm.dev> 2024-11-10 23:17:10 -0600
commit: 05666369a2e9bb23f9471b11009963eccc838bf6 (patch)
tree: 11a63a514d4655932ae6f8d3fcb2589d31a53150
parent: cd237804149bb098868048ccc001d3a6db986565 (diff)
12 files changed, 7 insertions, 525 deletions
diff --git a/api/static/js/api.js b/api/static/js/api.js
deleted file mode 100644
index 243edf7..0000000
--- a/api/static/js/api.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Description: This file contains functions to access the API with JWT authentication.
-
-/**
- * Accept an API endpoint, method, and body to send to the API.
- *  - If successful, return the response
- *  - If not, return false
- * @param {*} endpoint API endpoint
- * @param {*} method String (GET, POST, PUT, DELETE)
- * @param {*} body Data to send to the API
- * @returns response.json or false
- */
-async function accessAPI(endpoint, method, body) {
-    let response = await fetch(`/api${endpoint}`, {
-        method: method,
-        body: body,
-    });
-
-    if (response.ok) {
-        let data = await response.json();
-        data = await data;
-        return data;
-
-    }
-
-    return false;
-}
-\ No newline at end of file
diff --git a/api/templates/dashboard.html b/api/templates/dashboard.html
deleted file mode 100644
index 25372bd..0000000
--- a/api/templates/dashboard.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>LinkLogger | Dashboard</title>
-
-    <link rel="stylesheet" href="/static/css/dashboard.css">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
-    <script src="/static/js/jwt.js"></script>
-</head>
-<body>
-    <div>
-        <!-- Create a table with 4 columns with a total of 1000px width -->
-        <table>
-            <tr style="border: 2px solid #ccc;">
-                <th>Link</th>
-                <th>Visits</th>
-                <th>Redirect</th>
-                <th>Expire Date</th>
-            </tr>
-        </table>
-    </div>
-</body>
-</html>
-<script>
-    function createRow(index, link, logs) {
-        // Create the sub-table with the logs
-        let subTable = `
-            <table>
-                <tr>
-                    <th>ID</th>
-                    <th>Timestamp</th>
-                    <th>IP</th>
-                    <th>Location</th>
-                    <th colspan="2">ISP</th>
-                </tr>
-        `;
-        // Loop through the logs and create a row for each one
-        logs.forEach((log, index) => {
-            let logTimestamp = new Date(log.timestamp).toLocaleString('en-US', {
-                year: 'numeric',
-                month: '2-digit',
-                day: '2-digit',
-                hour: '2-digit',
-                minute: '2-digit',
-                second: '2-digit',
-                hour12: false
-            }).replace(',', '');
-
-            let row = `
-                <tr id="${log.id}-log">
-                    <td>${logs.length - index}</td>
-                    <td>${logTimestamp}</td>
-                    <td>${log.ip}</td>
-                    <td>${log.location}</td>
-                    <td>${log.isp}</td>
-                    <td><i class="fa-solid fa-trash" id="${log.id}/${link.link}""></i></td>
-                </tr>
-            `;
-            subTable += row;
-        });
-        subTable += '</table>';
-
-        // Convert the link expire timestamp to a readable date
-        let date = new Date(link.expire_date);
-        let expireDate = date.toLocaleTimeString('en-US', {
-            month: 'short',
-            day: 'numeric',
-            year: 'numeric',
-            hour: '2-digit',
-            minute: '2-digit',
-            second: '2-digit',
-            hour12: false
-        });
-
-        // Create the HTML for the row with sub-table
-        let row = `
-            <tr class="link-table-row">
-                <td>
-                    <button class="link-button" id="${index}">${link.link}</button>
-                </td>
-                <td>${logs.length}</td>
-                <td>${link.redirect_link}</td>
-                <td>${expireDate}</td>
-            </tr>
-            <tr class="log-table-row" id="${index}-logTR" style="display: none;">
-                <td colspan="6">
-                    ${subTable}
-                </td>
-            </tr>
-        `;
-        return row;
-    }
-
-
-
-    async function getData() {
-        const links = await accessAPI(`/links`, 'GET')
-        if (!links) {
-            throw new Error('Failed to fetch links');
-        }
-        // Links is an Array of objects with the link data
-        // Loop through the links and create a row for each one
-        // Do not use async because then the order or data in the
-        // table will change from time to time
-        for (let i = 0; i < links.length; i++) {
-            let link = links[i];
-            let logs = await accessAPI(`/links/${link.link}/logs`, 'GET')
-            if (!logs) {
-                throw new Error('Failed to fetch logs');
-            }
-            let row = createRow(i, link, logs);
-            document.querySelector('table').innerHTML += row;
-        }
-    }
-
-    // hideLogRows to all log-table-rows
-    function hideLogRows() {
-        let logTRs = document.querySelectorAll('.log-table-row');
-        logTRs.forEach(row => {
-            row.style.display = 'none';
-        });
-    }
-
-    // Add event listener to all link buttons
-    document.addEventListener('click', (event) => {
-        if (event.target.classList.contains('link-button')) {
-            let id = event.target.id;
-            let logTR = document.getElementById(`${id}-logTR`);
-            if (logTR.style.display === 'none') {
-                // Hide any open log tables
-                hideLogRows();
-                logTR.style.display = 'table-row';
-            } else {
-                logTR.style.display = 'none';
-            }
-        }
-    });
-
-    // Add an event listen to all trash bins
-    document.addEventListener('click', (event) => {
-        if (event.target.classList.contains('fa-trash')) {
-            // Confirm the user wants to delete the log
-            let confirmDelete = confirm('Are you sure you want to delete this log?');
-            if (confirmDelete) {
-                let id = event.target.id;
-                let link = id.split('/')[1];
-                let logId = id.split('/')[0];
-                fetch(`/api/links/${link}/logs/${logId}`, {
-                    method: 'DELETE'
-                });
-                let logRow = document.getElementById(`${logId}-log`)
-                logRow.remove();
-            }
-        }
-    });
-
-    getData();
-</script>
-\ No newline at end of file
diff --git a/api/templates/login.html b/api/templates/login.html
deleted file mode 100644
index 8e59481..0000000
--- a/api/templates/login.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>LinkLogger | Login</title>
-</head>
-<body>
-    <div>
-        <p id="error">Incorrect username/password. Please try again.</p>
-        <form action="/login" method="POST">
-            <input type="text" name="username" placeholder="Username" required>
-            <input type="password" name="password" placeholder="Password" required>
-            <button type="submit">Login</button>
-        </form>
-        <hr>
-        <p>Don't have an account? <a href="/signup">Create one now</a></p>
-    </div>
-</body>
-</html>
-
-<style>
-    body {
-        margin: 0;
-        padding: 0;
-        font-family: Arial, sans-serif;
-        background-color: #2c3338;
-    }
-
-    div {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        text-align: center;
-    }
-
-    input {
-        display: block;
-        margin: 10px auto;
-        width: 300px;
-        border-radius: 5px;
-        padding: 15px;
-        color: #ccc;
-        background-color: #3b4148;
-        border: none;
-        font-size: 17px;
-    }
-
-    button {
-        display: block;
-        margin: 10px auto;
-        width: 100%;
-        border-radius: 5px;
-        padding: 15px;
-        color: #ccc;
-        background-color: #415eac;
-        border: none;
-        font-size: 17px;
-        cursor: pointer;
-    }
-
-    hr {
-        color: #606468;
-    }
-
-    p {
-        color: #606468;
-    }
-
-    #error {
-        font-size: 15px;
-        color: #f55757;
-        display: none;
-    }
-
-    a {
-        color: #ccc;
-        text-decoration: none;
-    }
-
-    a:hover {
-        text-decoration: underline;
-    }
-</style>
-
-<script>
-    document.querySelector('form').addEventListener('submit', async function(event) {
-        // Prevent default form submission
-        event.preventDefault();
-
-        const formData = new FormData(this);
-        // Send POST request to /token containing form data
-        const response = await fetch('/api/auth/token', {
-            method: 'POST',
-            body: formData
-        });
-
-        if (response.status != 200) {
-            document.getElementById('error').style.display = 'block';
-        } else {
-            window.location.href = '/dashboard';
-        }
-    });
-</script>
-\ No newline at end of file
diff --git a/api/templates/signup.html b/api/templates/signup.html
deleted file mode 100644
index 32962b7..0000000
--- a/api/templates/signup.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>LinkLogger | Signup</title>
-</head>
-<body>
-    <div>
-        <p id="error"></p>
-        <form action="/signup" method="POST">
-            <input type="text" name="username" placeholder="Username" required>
-            <input type="password" name="password" placeholder="Password" required>
-            <button type="submit">Signup</button>
-        </form>
-        <hr>
-        <p>Already have an account? <a href="/login">Log in now</a></p>
-        <p>Passwords must be at least 8 characters long and contain a number, special character, and uppercase character.</p>
-    </div>
-</body>
-</html>
-
-<style>
-    body {
-        margin: 0;
-        padding: 0;
-        font-family: Arial, sans-serif;
-        background-color: #2c3338;
-    }
-
-    div {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        text-align: center;
-        max-width: 330px;
-    }
-
-    input {
-        display: block;
-        margin: 10px auto;
-        width: 300px;
-        border-radius: 5px;
-        padding: 15px;
-        color: #ccc;
-        background-color: #3b4148;
-        border: none;
-        font-size: 17px;
-    }
-
-    button {
-        display: block;
-        margin: 10px auto;
-        width: 100%;
-        border-radius: 5px;
-        padding: 15px;
-        color: #ccc;
-        background-color: #415eac;
-        border: none;
-        font-size: 17px;
-        cursor: pointer;
-    }
-
-    hr {
-        color: #606468;
-    }
-
-    p {
-        color: #606468;
-    }
-
-    #error {
-        font-size: 15px;
-        color: #f55757;
-        display: none;
-    }
-
-    a {
-        color: #ccc;
-        text-decoration: none;
-    }
-
-    a:hover {
-        text-decoration: underline;
-    }
-</style>
-
-<script>
-    document.querySelector('form').addEventListener('submit', async function(event) {
-        // Prevent default form submission
-        event.preventDefault();
-
-        // Get form data
-        const formData = new FormData(this);
-
-        // Send POST request
-        const response = await fetch('/api/users/register', {
-            method: 'POST',
-            body: formData
-        });
-
-        if (response.status != 200) {
-            const data = await response.json()
-            
-            document.getElementById('error').style.display = 'block';
-            document.getElementById('error').innerText = data.detail;
-        } else {
-            window.location.href = '/dashboard';
-        }
-    });
-</script>
-\ No newline at end of file
diff --git a/app/README.md b/app/README.md
deleted file mode 100644
index 74872fd..0000000
--- a/app/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# React + TypeScript + 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
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
-
-- Configure the top-level `parserOptions` property like this:
-
-```js
-export default tseslint.config({
-  languageOptions: {
-    // other options...
-    parserOptions: {
-      project: ['./tsconfig.node.json', './tsconfig.app.json'],
-      tsconfigRootDir: import.meta.dirname,
-    },
-  },
-})
-```
-
-- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
-- Optionally add `...tseslint.configs.stylisticTypeChecked`
-- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
-
-```js
-// eslint.config.js
-import react from 'eslint-plugin-react'
-
-export default tseslint.config({
-  // Set the react version
-  settings: { react: { version: '18.3' } },
-  plugins: {
-    // Add the react plugin
-    react,
-  },
-  rules: {
-    // other rules...
-    // Enable its recommended rules
-    ...react.configs.recommended.rules,
-    ...react.configs['jsx-runtime'].rules,
-  },
-})
-```
diff --git a/app/index.html b/app/index.html
index e4b78ea..882ffc0 100644
--- a/app/index.html
+++ b/app/index.html
@@ -2,9 +2,8 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>LinkLogger</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/app/src/assets/react.svg b/app/src/assets/react.svg
deleted file mode 100644
index 6c87de9..0000000
--- a/app/src/assets/react.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
-\ No newline at end of file
diff --git a/app/src/components/Dashboard.tsx b/app/src/components/Dashboard.tsx
index 373a07f..ccbfd99 100644
--- a/app/src/components/Dashboard.tsx
+++ b/app/src/components/Dashboard.tsx
@@ -6,6 +6,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTrash } from '@fortawesome/free-solid-svg-icons';
 
 function Dashboard() {
+    document.title = 'LinkLogger | Dashboard'
+
     interface Log {
         id: number;
         link: string;
diff --git a/app/src/components/Login.tsx b/app/src/components/Login.tsx
index 8235b65..a3e5cf9 100644
--- a/app/src/components/Login.tsx
+++ b/app/src/components/Login.tsx
@@ -5,6 +5,8 @@ import { useNavigate } from 'react-router-dom';
 import axios from 'axios';
 
 function Login() {
+    document.title = 'LinkLogger | Login'
+
     const [username, setUsername] = useState('');
     const [password, setPassword] = useState('');
     const [isSubmitting, setIsSubmitting] = useState(false);
diff --git a/app/src/components/Signup.tsx b/app/src/components/Signup.tsx
index 293b51a..547fa9e 100644
--- a/app/src/components/Signup.tsx
+++ b/app/src/components/Signup.tsx
@@ -5,6 +5,8 @@ import { useNavigate } from 'react-router-dom';
 import axios from 'axios';
 
 function Signup() {
+    document.title = 'LinkLogger | Signup'
+
     const [username, setUsername] = useState('');
     const [password, setPassword] = useState('');
     const [passwordConfirm, setPasswordConfirm] = useState('');
diff --git a/app/src/index.css b/app/src/index.css
deleted file mode 100644
index 6119ad9..0000000
--- a/app/src/index.css
+++ /dev/null
@@ -1,68 +0,0 @@
-:root {
-  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-a:hover {
-  color: #535bf2;
-}
-
-body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
-}
-
-h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
-}
-
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
-}
-button:hover {
-  border-color: #646cff;
-}
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
-}
diff --git a/app/src/main.tsx b/app/src/main.tsx
index bef5202..4aff025 100644
--- a/app/src/main.tsx
+++ b/app/src/main.tsx
@@ -1,6 +1,5 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
-import './index.css'
 import App from './App.tsx'
 
 createRoot(document.getElementById('root')!).render(
author	Parker <contact@pkrm.dev>	2024-11-10 23:17:10 -0600
committer	Parker <contact@pkrm.dev>	2024-11-10 23:17:10 -0600
commit	05666369a2e9bb23f9471b11009963eccc838bf6 (patch)
tree	11a63a514d4655932ae6f8d3fcb2589d31a53150
parent	cd237804149bb098868048ccc001d3a6db986565 (diff)